Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Wed, 7 Jul 2010 12:15:48 +0000 (12:15 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Wed, 7 Jul 2010 12:15:48 +0000 (12:15 +0000)

Trivial merge